Auto merge of #1470 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 31 Mar 2015 16:31:44 +0000 (16:31 +0000)
committerbors <bors@rust-lang.org>
Tue, 31 Mar 2015 16:31:44 +0000 (16:31 +0000)

Trivial merge